Add ${misc:Depends} to debian/control for debhelper.

diff --git a/debian/changelog b/debian/changelog
index 6171138801295e5fa72c8c444e76d572a417d608..3529bfb97274e3cf5d6e2f4b45f9663cb2014cb8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,12 +31,15 @@ emacs23 (23.2+1-3) unstable; urgency=low
     <svenjoac@gmx.de>, and thanks to Stéphane Glondu
     <glondu@debian.org> for the 23.2+1-2.1 NMU.
 
+  * Add ${misc:Depends} to debian/control for debhelper.  Thanks to
+    Stéphane Glondu <glondu@debian.org> for the 23.2+1-2.1 NMU.
+
   * Fix startup hang on GNU/kFreeBSD (fix-kfreebsd-startup.diff).
     Thanks to antoine beaupre <anarcat@anarcat.ath.cx> for the report
     and Petr Salinger <Petr.Salinger@seznam.cz> for the patch.
     (closes: #559392)
 
- -- Rob Browning <rlb@defaultvalue.org>  Wed, 11 Aug 2010 23:13:12 -0500
+ -- Rob Browning <rlb@defaultvalue.org>  Sat, 14 Aug 2010 11:57:17 -0500
 
 emacs23 (23.2+1-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index c5992890799822e518708c18e79cd316f319a3a2..05da4b837ff459c30db0d1c73e43a326a5b73e7a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Standards-Version: 3.7.2
 
 Package: emacs
 Architecture: all
-Depends: emacs23 | emacs23-lucid | emacs23-nox
+Depends: emacs23 | emacs23-lucid | emacs23-nox, ${misc:Depends}
 Provides: emacsen, editor, mail-reader, news-reader
 Description: The GNU Emacs editor (metapackage)
  GNU Emacs is the extensible self-documenting text editor.
@@ -23,7 +23,7 @@ Description: The GNU Emacs editor (metapackage)
 
 Package: emacs23-lucid
 Architecture: any
-Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: emacs23, emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
 Conflicts: emacs23, emacs23-nox, emacs23-gtk
@@ -34,7 +34,7 @@ Description: The GNU Emacs editor
 
 Package: emacs23-nox
 Architecture: any
-Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
 Conflicts: emacs23, emacs23-lucid, emacs23-gtk
@@ -45,7 +45,7 @@ Description: The GNU Emacs editor (without X support)
 
 Package: emacs23
 Architecture: any
-Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: editor, emacsen, info-browser, mail-reader, news-reader, emacs23-gtk
 Suggests: emacs23-common-non-dfsg
 Conflicts: emacs23-lucid, emacs23-nox, emacs23-gtk
@@ -56,7 +56,7 @@ Description: The GNU Emacs editor (with GTK+ user interface)
 
 Package: emacs23-bin-common
 Architecture: any
-Depends: emacs23-common (= ${source:Version}), ${shlibs:Depends}
+Depends: emacs23-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: The GNU Emacs editor's shared, architecture dependent files
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture dependent infrastructure
@@ -64,7 +64,7 @@ Description: The GNU Emacs editor's shared, architecture dependent files
 
 Package: emacs23-common
 Architecture: all
-Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}
+Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
 Suggests: emacs23-el, emacs23-common-non-dfsg
 Conflicts: emacs23-el (<< ${Source-Version})
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
@@ -74,7 +74,7 @@ Description: The GNU Emacs editor's shared, architecture independent infrastruct
 
 Package: emacs23-el
 Architecture: all
-Depends: emacs23-common (= ${source:Version})
+Depends: emacs23-common (= ${source:Version}), ${misc:Depends}
 Description: GNU Emacs LISP (.el) files
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the elisp sources for the convenience of users,

diff --git a/debian/control.in b/debian/control.in
index 312203b7edf38fa9335700ef521a07566be95251..21ea9f9e8def9a9cbb91a73bfd0d02cf6d09ee02 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +14,7 @@ Standards-Version: 3.7.2
 
 Package: emacs
 Architecture: all
-Depends: @DEB_FLAVOR@ | @DEB_FLAVOR@-lucid | @DEB_FLAVOR@-nox
+Depends: @DEB_FLAVOR@ | @DEB_FLAVOR@-lucid | @DEB_FLAVOR@-nox, ${misc:Depends}
 Provides: emacsen, editor, mail-reader, news-reader
 Description: The GNU Emacs editor (metapackage)
  GNU Emacs is the extensible self-documenting text editor.
@@ -23,7 +23,7 @@ Description: The GNU Emacs editor (metapackage)
 
 Package: @DEB_FLAVOR@-lucid
 Architecture: any
-Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: @DEB_FLAVOR@, emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
 Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, emacs23-gtk
@@ -34,7 +34,7 @@ Description: The GNU Emacs editor
 
 Package: @DEB_FLAVOR@-nox
 Architecture: any
-Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
 Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, emacs23-gtk
@@ -45,7 +45,7 @@ Description: The GNU Emacs editor (without X support)
 
 Package: @DEB_FLAVOR@
 Architecture: any
-Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: editor, emacsen, info-browser, mail-reader, news-reader, emacs23-gtk
 Suggests: @DEB_FLAVOR@-common-non-dfsg
 Conflicts: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox, emacs23-gtk
@@ -56,7 +56,7 @@ Description: The GNU Emacs editor (with GTK+ user interface)
 
 Package: @DEB_FLAVOR@-bin-common
 Architecture: any
-Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${shlibs:Depends}
+Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: The GNU Emacs editor's shared, architecture dependent files
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture dependent infrastructure
@@ -64,7 +64,7 @@ Description: The GNU Emacs editor's shared, architecture dependent files
 
 Package: @DEB_FLAVOR@-common
 Architecture: all
-Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}
+Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
 Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg
 Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version})
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
@@ -74,7 +74,7 @@ Description: The GNU Emacs editor's shared, architecture independent infrastruct
 
 Package: @DEB_FLAVOR@-el
 Architecture: all
-Depends: @DEB_FLAVOR@-common (= ${source:Version})
+Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${misc:Depends}
 Description: GNU Emacs LISP (.el) files
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the elisp sources for the convenience of users,